switch gbfile supplemental plane test to nmea. (#786)

diff --git a/reference/testsupplementalplane.csv b/reference/testsupplementalplane.csv
index c56f44dc50869c222100316ffe261661cbccacd0..12ab1a870f2731cf4d86f0ffa287b426c1b7512a 100644 (file)
--- a/reference/testsupplementalplane.csv
+++ b/reference/testsupplementalplane.csv
@@ -1,10 +1,10 @@
-No,Latitude,Longitude,Name,Description,Symbol\r
-1,35.972033,-87.134700,"GCEBB","Mountain Bike Heaven by susy1313","Waypoint"\r
-2,36.090683,-86.679550,"GC1A37","The 😁 Troll by a182pilot & Family","Waypoint"\r
-3,35.996267,-86.620117,"GC1C2B","Dive Bomber by JoGPS & family","Waypoint"\r
-4,36.038483,-86.648617,"GC25A9","FOSTER by JoGPS & Family","Waypoint"\r
-5,36.112183,-86.741767,"GC2723","Logan Lighthouse by JoGps & Family","Waypoint"\r
-6,36.064083,-86.790517,"GC2B71","Ganier Cache by Susy1313","Waypoint"\r
-7,36.087767,-86.809733,"GC309F","Shy's Hill by FireFighterEng33","Waypoint"\r
-8,36.057500,-86.892000,"GC317A","GittyUp by JoGPS / Warner Parks","Waypoint"\r
-9,36.082800,-86.867283,"GC317D","Inlighting by JoGPS / Warner Parks","Waypoint"\r
+No,Latitude,Longitude,Name\r
+1,35.972033,-87.134700,"GCEBB"\r
+2,36.090683,-86.679550,"GC1A37😁"\r
+3,35.996267,-86.620117,"GC1C2B"\r
+4,36.038483,-86.648617,"GC25A9"\r
+5,36.112183,-86.741767,"GC2723"\r
+6,36.064083,-86.790517,"GC2B71"\r
+7,36.087767,-86.809733,"GC309F"\r
+8,36.057500,-86.892000,"GC317A"\r
+9,36.082800,-86.867283,"GC317D"\r

diff --git a/reference/testsupplementalplane.nmea b/reference/testsupplementalplane.nmea
new file mode 100644 (file)
index 0000000..2b92e7c
Binary files /dev/null and b/reference/testsupplementalplane.nmea differ

diff --git a/reference/testsupplementalplane.pcx b/reference/testsupplementalplane.pcx
deleted file mode 100644 (file)
index 5cadadd..0000000
Binary files a/reference/testsupplementalplane.pcx and /dev/null differ

diff --git a/testo.d/gbfile.test b/testo.d/gbfile.test
index 380f4277f6a52454bc0e834444a0adb9202063c9..9f6d69cd737fcf2ff877334209880777baa37cc8 100644 (file)
--- a/testo.d/gbfile.test
+++ b/testo.d/gbfile.test
@@ -8,10 +8,6 @@ compare ${REFERENCE}/track/nmea.gpx ${TMPDIR}/nmea_utf16.gpx
 #   with \r\n line endings
 gpsbabel -i nmea -f ${REFERENCE}/track/nmea_utf16_dos -o gpx -F ${TMPDIR}/nmea_utf16_dos.gpx
 compare ${REFERENCE}/track/nmea.gpx ${TMPDIR}/nmea_utf16_dos.gpx
-# TODO(robertl): Check with tsteven4 if we can find another
-# appropriate test withot PCX
-# Assumes pcx reader is still using gbgetstr.
-# These are handcrafted input files, they may not be legal pcx files.
 #   with a unicode character from the supplemental plane encoded in utf16le.
-## gpsbabel -i pcx -f ${REFERENCE}/testsupplementalplane.pcx -o unicsv -F ${TMPDIR}/testsupplementalplane.csv
-##  compare ${REFERENCE}/testsupplementalplane.csv ${TMPDIR}/testsupplementalplane.csv
+gpsbabel -i nmea -f ${REFERENCE}/testsupplementalplane.nmea -o unicsv -F ${TMPDIR}/testsupplementalplane.csv
+compare ${REFERENCE}/testsupplementalplane.csv ${TMPDIR}/testsupplementalplane.csv